Fixes removing Widgets from Grid header/footer

Change-Id: Ic2872fec49851ea3c8ed32ca2a77dcbd27e739a8