Merge "Revert "Fix layout issues in storage dialog header"" into tm-dev