Merge branch 'ub-now-master' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Launcher3 into ub-now-master