Merge "Launch home activity in home stack if coming from ResolverActivity"...
Merge "Launch home activity in home stack if coming from ResolverActivity" into nyc-dev am: b7d513cb
am: 71a9d409
* commit '71a9d409':
Change-Id: I19f5518cf4feadf2125e1e9f851bf7ac5326b955