Merge "DisplayCutout: Cache inflations from resources"