Merge "Revert "Issue resets to the SIM bouncer"" into main