am 12fdaf85: am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev

* commit '12fdaf8589813065d2e8b9873196471ed38c7b80':
  Fixed a racecondition where the camera would not launch