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