Merge "[QS] Add PageIndicator to footer" into pi-dev