Merge "Fix inflation using themed LayoutInflater" into nyc-support-25.2-dev