Merge "Fix issue #37938835: Undismissable "Camera is running in the..." into oc-dev