Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev