Merge "Fix improper transition from gallery to camera"
am: bd400d88d9

Change-Id: I0f805deaf14c21eb0a1ec340f8f649d78c983880