Merge "DisplayInfo: don't check renderFrameRate for equal()" into main