fix(layout): be resistant to edge cases where Layout.remove() is invo…

fix(layout): be resistant to edge cases where Layout.remove() is invo… #341