Merge "Automatically switching the ActivityController based on the default home app preference" into ub-launcher3-master