Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread