Merge "Add @VisibleForTesting to getUniqueLabel()" into main