Merge "Updating fallback activity" into ub-launcher3-master