Merge "Finish selection mode after copyto and share..." into nyc-dev