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

Change-Id: I96bc422662f7b86fbfd1d65024771492caea5bb5