Merge "hwc: Use displayFrame information in caching"