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

Change-Id: Ib1687654181f9ab0c44017e180f74ed7edaadfc9