Merge "Merge "Set PageIndicator pages in QSPanel#onMeasure" into rvc-dev am: 7577e1d2cf am: 62703bc5d2" into rvc-d1-dev-plus-aosp