Merge "Prevent DecorContext from creating DisplayContext for default display."