Merge \\"Block camera gesture during secondary user SUW\\" into nyc-mr1-dev am: e1a3a449a4
am: d0cecf9d67

Change-Id: I675832bc2c88477c8cf5e70f30a5b8e9b25048ff