Merge "Add support to render app on multiple displays"