Merge "Fix variants for OO UI images"