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

Change-Id: Ibd46e11a5ab28743899294e75c02ebacd45e8460