Merge "Update API for UiSelector."