bug-821623 [General][Building Blocks] Disabled Button States are not correct