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

Change-Id: I3753772cd5251ebd2cd54d8d9a3e7cf95cdf5f3e