Merge "Merge commit 'refs/changes/42/2374342/1' of sso://googleplex-android/platform/packages/apps/Launcher3" into ub-launcher3-master