Merge "Added Developer Options settings for multi-window mode."