Merge "Update DisplayContent tap exclude region on window resize" into oc-mr1-dev