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

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