Merge "Replace observer for USER_SWITCHED broadbast by a UserSwitchObserver" into main