Merge "Use the string "OK" instead of "Set" for preferred actions" into jb-mr2-dev