Merge "Add UxStatesManager class." into tm-mainline-prod