Merge "Fixing issue with positioning tasks when moving to fullscreen." into oc-dev