Merge "Fixed UserVisibilityMediator so user can start visible on same display again."