Merge "Recreate the bitmap cache when it is smaller than needed" into nyc-mr2-dev