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