Merge "Check correct DisplayContent when making window freezing screen" into oc-mr1-dev
am: 06610fc753

Change-Id: I5d282da0356955dd5ca472828d9e0e2d4db7d36b