Merge "Enhance texteditor background drawing performance" into devel/master