Merge "Correct where to set defaultRefreshRateInHbmHdr and defaultRefreshRateInHbmSunlight" into tm-qpr-dev