Merge "Check permission for activity embedding" into oc-mr1-dev