Merge "SnapdragonCamera: Reorder logic when closing cameras" into camera.lnx.1.0-dev.1.0