Merge "Only migrate 2-button setting if set" into qt-dev
am: 571ab06ec0

Change-Id: I90c8f91cfe29fe2dbb63abab95bf9404fcee63fc