Merge "Replace onUserSwithing() with onUserStarting() to handle updateOverlayForUser()"