Merge "Make package whitelist the last check in activity starter." into qt-dev am: 52981d54de
am: ce4786b305

Change-Id: Iedcb147868bb12d9dfb3f291f456c59d073167c7