Merge "Settings: fix storage measurement for device without emulated sdcard"