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