Merge "Fix improper transition from gallery to camera"