Merge "DO NOT MERGE: Updating SupportLib version to 25.3.1 and extVersion to 47" into nyc-support-25.3-dev