Merge "New assets for the edit screen" into lmp-mr1-dev