Merge "Fix issue #2461567: Home screen redraw messed up"