Merge "CameraServiceProxy: Handle race between systemserver and cameraserver" into qt-dev