Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev