Merge "CameraService: fix race condition and wrong last frame number."