Merge "Exposing activity type in targets so that we can handle home activity differently" into pi-dev
am: 6dfad28bed

Change-Id: I1ba8a38d6de62a69f5029b131f490e9495d4d998