Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev