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

Change-Id: I31b94b492b4ba9d4bd837c7fc036d238738bf873