Merge "Merge "Not bypassing while the camera is being launched" into qt-r1-dev am: a19fbdf51b" into qt-r1-dev-plus-aosp