Merge "Merging from ub-launcher3-master @ build 6682763"