Merge "Refresh action mode always when selection is modified." into nyc-dev