Merge "SF: Fix repaint everything logic" into pi-dev