Merge "Adds getLayoutInflater() to return a cached value." into oc-dev