Merge "Use normalized CachedDisplayInfo as key" into tm-qpr-dev