Merge "Revert "Remove the version check for opting apps with SAW into bubbles"" into main