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

Change-Id: Icf66b31509133ce4d26f91751082c872bab4ec41