Merge proposals dependent on lp://qastaging/~phablet-team/camera-app/refactor-and-fix-editor-tests

1. refactor-and-fix-editor-tests
2. Dependent merge proposals