Merge "Delete unnecessary line to trigger build" into ub-launcher3-master