Merge "Fixing AOSP TaplTestsLauncher3.testAllAppsFromHome test" into ub-launcher3-master