Merge "New design for photo editor" into lmp-mr1-dev