Merge "Add iconfactory*Size values to Wear's Resolver Theme" into main