Merge "add retry to DisplayRefreshRateTest" into jb-dev