Merge "Changing order of binding to prevent errant flashing while loading workspace."