Merge "Removing some reflection code" into ub-launcher3-calgary-polish