Merge "Add test for PagingIndicator" into nyc-dev