Merge "Bind clock edit icon color (2/2)" into main