Merge "Adds getLayoutInflater() to return a cached value." into nyc-support-25.4-dev