Merge "Backport missing permission check for querying main activity intent" into sc-dev