Merge "Use packageName instead of specific secondary launcher activity" into rvc-dev am: fb715c04 am: 72c3ea0a Change-Id: I416a2b78e0ad067063578f23a97f088bc639e926