Merge "Recover focus on size change in ListView" into nyc-dev