Merge "Only consider gone for layout if parent is gone for layout" into qt-r1-dev