Merge "Remove colors.xml file from core/res/res/values-watch/" into main