Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread