Merge "Storage Settings crash" into tm-dev