Merge "Fix issue #5155678: Portrait > Landscape full-screen transition..."