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

Change-Id: Id56055829c29c55e2b2ad448997243f33285c70e