Merge "Merge "Update DisplayContent tap exclude region on window resize" into oc-mr1-dev am: 43bc0adc9d am: b5bcd4fb37  -s ours"