Use currentTool() as far as possible, avoid access m_currentTool.
Merge branch 'master' into feature/color-picker