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

Change-Id: Ia69f742dd17cf0b2219641050353ff56ac181adf