Merge "Revert "Revert "Revert "Simplifying some page indicator dots attributes so that it can"""" into udc-dev