am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev

* commit '36052477465f51a4c690e4e8dfb290fb15ce88b0':
  Add setting to disable camera gesture