Merge "Ensure bubble bar gets excluded from the screenshot in app clips" into main