Merge "Moved context modes into view, renamed to action modes"