Merge "The PageAdapter update might be caused by the RecylerView." into nyc-dev