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

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