Merge "SF: Add autorefresh to drawingstate"