Merge "Add support for singleTaskInstance displays"