Merge "Cleanup messages in onDestory in ChooserActivity" into qt-dev
am: 545021d0c9

Change-Id: If1aa39fc0734a298defaed92d5eb3ff1dbc9ea4b