Merge "Make ResolverActivity default allow being launched on remote display" into tm-qpr-dev