Correctly dis-/enabling reference toolbars

Change-Id: I12f0a1be4e3a65bba2bb10c1becdba3218b06f27
Merge "Correctly dis-/enabling reference toolbars"