Merge "Fix wrong API for getLayoutInflater" into nyc-support-25.4-dev