Merge "Add back missing synchronized in stopGuestOrEphemeralUserIfBackground"