Merge "Issue resets to the SIM bouncer (take #2)" into main