Merge "Fix incorrect storage calculation when SD card is inserted"