Merge "Fix issues with launching activities on virtual displays"