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

Change-Id: I44b800b44802cc5ac1cabbb48c98c07eff3ffbdf