Merge "Fix page indicator bugs for foldable" into udc-qpr-dev