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

Change-Id: I781dd1bdea71e222b5b61c2869aef1624aeb1e93