Merge "Take panel count into account for page indicator size" into sc-v2-dev