Merge "Cache Display.Mode so we can ignore refresh rate changes" into rvc-d1-dev