Merge "Fix apps spinner jank." into nyc-dev