Double-commit photo editor changes for cover image to master.
Merge branch 'master' into alpha-redesign