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

Change-Id: I6ab2194d50a6d7dfb7bd7c13bab776331c426c23