Merge "Gracefully fallback to new ComponentName if one is renamed/removed" into ub-launcher3-master