Merge \\"Add a secure setting for double twist gesture for camera flip.\\" into nyc-mr1-dev am: 3e869587e8
am: b8d3caf4b8

Change-Id: I9265956ac2253f8a19c3a7f4dc8e6d9ada97f931