Merge "Add wear_watchfaces to SettingsToPropertiesMapper" into main