Merge "Use packageName instead of specific secondary launcher activity" into rvc-dev am: fb715c04 am: 20e89693 Change-Id: I98d6bc2197ed6a2f70d5e2d77f0445a00593ce39