Merge "Merge remote-tracking branch 'goog/ub-launcher3-master' into temp"