Merge "Show storage slow dialog allowing state loss." into mnc-dev