Merge "More eagerly collect isSimpleUserSwitcher." into tm-qpr-dev