Merge "Removing some support lib dependencies" into ub-launcher3-dorval-polish