Merge "Skip refresh if number of pages hasn't changed" into rvc-dev