Merge "Revert "Fix issue in attached layouting"" into qt-dev