Merge "SF: Color changes should dirty entire display"