am 9053af6f: am e94561ec: Merge "Fix Cancelling a text action activity deletes...
am 9053af6f: am e94561ec: Merge "Fix Cancelling a text action activity deletes the selected text" into mnc-dev
* commit '9053af6f':
Fix Cancelling a text action activity deletes the selected text