Merge "Work on issue #36427964: SecurityException: Unable to find app..." into oc-dev