Merge "Fixing regression in AllApps being aggressively dismissed after returning to Launcher." into ub-launcher3-burnaby