Merge "Removing some redundant resource definitions" into ub-launcher3-master