Merge "Removing unnecessary intent-filter construction" into ub-launcher3-burnaby