Merge "Associate freezing display with a target display id." into oc-dev