Merge "Fix issue with home activity started with standard activity type" into pi-dev