Merge "Removing some unused functionalities" into ub-launcher3-burnaby