Merge "Add DisplayController in PreviewContext's allowed objects" into tm-dev