am b8645fa7: am a7cad8e8: Merge "Fixed a bug where the secure camera would flash when rotated" into mnc-dr-dev

* commit 'b8645fa79e06c2e5cb87eb7fddccf3d2679c5f71':
  Fixed a bug where the secure camera would flash when rotated