Merge "Merge "Make ResolverActivity default allow being launched on remote display" into tm-qpr-dev am: 9e7bf1bcc3 am: 7d05aa6cf9"