Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev