Merge "Update public style/attr definitions" into nyc-support-25.1-dev