Merge "Avoid 9patch cache lookups when possible"