Merge "Don't finish resolver activity onStop if it is for home intent" into nyc-dev