Merge "Convert argument to intent in ChooseTypeAndAccountActivity" into qt-dev