Fix duplicate save and cancel buttons showing when editing xblocks

STUD-1531