Merge "Fix bugs around overlay action modes."