MDL-37516 Conditional activities: user field condition display fixes