Merge "Add a display flag for maintaining its own focus and touch mode."