Merge "SF: Fix repaint everything logic" into pi-dev am: 052a61ebbe
am: d2121cf864

Change-Id: Ie94ec0f7539d1936eb018c277cf327440a24b617