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

Change-Id: I7f41f3d8fc8cb35ecda756b0fd21034e3e499493