Merge "Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into sc-v2-dev