Merge "Make sure to not block SystemService#onUserStarting() in IMMS" into main