am 090eecb9: am 33d2b3a3: am fcc33738: Merge "Suppress camera launch gesture until setup is complete Bug: 22792563" into mnc-dr-dev

* commit '090eecb9f3d8b055e2ba1b13e20f4922a2fdb075':
  Suppress camera launch gesture until setup is complete Bug: 22792563