am 88768cc3: am 6adc9602: am 825dd9dd: am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev

* commit '88768cc35789638f16b5a1a9c9de99eb4f6cd408':
  Retain display when creating specialized contexts. (DO NOT MERGE)