Merge "Force redraw of new/resized windows" into jb-mr1-dev