Merge "SnapdragonCamera: Wait for aux camera to close before closing main" into camera.lnx.1.0-dev.1.0