Merge "Total and available fields missing in Settings storage menu"