Merge "cameraserver: Correct camera1 -> api2 shim layer handling for video stabilization."