Merge "SF: Clean up forced refresh and repaint"