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

Change-Id: I92755956d3047902086945ce7479fc16bfa70b84