Merge "Support customization of paging indicator dimensions" into nyc-dev