am 22af5b84: (-s ours) am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev

* commit '22af5b842869abff5418263e6fb0b4b925077629':
  Force all windows to redraw before unblanking screen