Merge "Avoid NetInitiatedActivity overlaid by non-system apps" into sc-dev