Merge "Fix issue #4280324: Returning to Fullscreen Layout with WebView..."