Tweak to make willMoveToSuperview: a bit more robust