Merge "[PATCH] Buttons in storage settings" into qt-dev