Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev