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

* commit '04c8d402fa824c548dc5de82c56e63eb5df02371':
  Properly draw the window background on window resize Bug #7385090