Merge "[QS] Add PageIndicator to footer" into pi-dev am: 84745ebe11
am: b3b0140d3e

Change-Id: Ieda96ff26623f59a6a7762091a299a13ba87d2e9