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

Change-Id: I23ce37829dc16d1887797cebd8f7b6bcc19ea908