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

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