Photo view in editor fixes
am: eec6992932

Change-Id: Ida0e586910a15920d71892325f689540d46d9416