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

Change-Id: I434af449195c4db0b70689912c426865c1f5cffa