Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev