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

Change-Id: I9955b6504229cda81857f3cee6ada1c37948849d