Merge "Solve inflated view/cached view inconsistency"