Merge "Add a method to support multi-display usages"