Merge "Use shell package name when starting activities" into qt-r1-dev am: 2cd6ecda90 am: a023a7ae5a
am: a972f21f17

Change-Id: Ie44c6e144667e5759ff56a5c43858eb4cd077d53