Merge "Fix text coloring for action mode "close" option" into jb-dev