Merge "Merge "Set PageIndicator pages in QSPanel#onMeasure" into rvc-dev am: 7577e1d2 am: a7d9ccee" into rvc-d1-dev-plus-aosp