Merge "ActionMode fixes found in testing" into nyc-dev