Merge "Fix getting stuck in BackgroundAppState for 2-button mode" into ub-launcher3-qt-dev am: 72c6e7b736
am: dcff2f1875

Change-Id: Ifd59f5e3a82aa956993d1546118f047b75c595bf