Merge "Camera: Flush all state transitions before reconfigureCamera" into main