Merge "If android version is different & app has SAW, auto-grant bubbles" into main