Merge "Camera2: remove waitUntilIdle from Camera2 API"