Merge "Remove references to IComposer.createDisplay"