Merge "camera: fix deadlock because of mStateSwitchLock"