Merge "Prevent Save App Pair from showing up on 3p launcher" into main