Merge changes Ifb32729f,I8a8638f6 into mnc-dr-dev

* changes:
  Enable touch boost during camera.
  Modify screen-off behavior.