Merge "Fix build break for Launcher3GoIconRecents" into ub-launcher3-master