Merge "Update UserIconInfo to include LauncherUserInfo configs" into main