Merge "Ensure SIM bouncer shows" into main