Merge "Flag guard the quarantined apps screen" into main