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

Change-Id: I44e04c4247a4b5b35962a77f7cc03cc601322045