Merge "Check correct DisplayContent when making window freezing screen" into oc-mr1-dev