Merge "Stop automatically creating selection action mode." into nyc-dev