Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev