Merge "Added remote display support"