Merge "Fixing crash in some full screen cases"