Defer the selection for the formatter. Cures problems with the selection retruning the previous result and therefore stopping the format bar from disappearing.
Bring in master and fix conflicts