Merge "Optimize drawHardwareAccelerated method in Editor class"