Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()."