Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev