Merge "Fix issue with not forwarding config. changes on the window size" into oc-dev
am: e577a840a1

Change-Id: Ib45240ea01f5645763df3e746b7ee350f3b48abc