Merge "Don't exit selection after sharing and copying..." into nyc-dev