am 1ef95dc5: am 413493b5: am c7789c3e: am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev

* commit '1ef95dc59cf5b151a9d55f0d8e55f5be1934c3cd':
  Add setting to disable camera gesture