Merge "[VRR] Move refresh rate aggregation from invalidate to after onDraw" into main