Merge "Use shell package name when starting activities" into qt-r1-dev