Merge "Always update PageIndicator visibility" into rvc-dev