Merge "Comment fix" into ub-launcher3-master