Merge "Fix issue with home activity started with standard activity type" into pi-dev
am: 25a1d9d898

Change-Id: If0ebf8ac3100dbef8b97c4c8eba50857f483d74e