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

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