merged from protocol 3 branch; fix for DFL-41,highlighting should be turned off when switching away from DOM view
merged from protocol 3 branch; fix for DFL-41,highlighting should be turned off when switching away from DOM view

runeh/dragonfly-stp-1,runeh/dragonfly-stp-1,runeh/dragonfly-stp-1