Merge "Don't launch ResolverActivity in home stack" into qt-dev
am: c82290fe51

Change-Id: Ibcd852cc5e40b7ec06f115ec4e41f6209cc3d108