am 8ec657f9: Merge "New assets for the edit screen" into lmp-mr1-dev

* commit '8ec657f9e44271d56f1100cf7cb769a7df5c0d0c':
  New assets for the edit screen