Merge "CameraService: fix waitUntilIdle bug revealed by TestingCamera2."