Bug 994664 - Improve SelectionHandler UI performance, r=wesj