Merge "to help debugging [2461567] Home screen redraw messed up"