Merge "Only migrate 2-button setting if set" into qt-dev