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

* commit 'dcf4e6806bc39fc8e28b40140a1d360e5634c5a8':
  New assets for the edit screen