Merge "Removing a workaround to make NevigationModeSwitchRule pass on CF" into ub-launcher3-master