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

Change-Id: I6f447837aef60e3c261b2ab4d882a3a7fe9308a4