Merge "Separating refresh rate tracking to a separate class" into tm-dev