am 64a0f914: Merge "Optimize drawHardwareAccelerated method in Editor class"

* commit '64a0f914a137ae05f8f9719b6f27c4c81eee3a0f':
  Optimize drawHardwareAccelerated method in Editor class