Merge "VRI: use clearFrameRate when the frame rate is 0" into main