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

Change-Id: I3aeb01ef69b2fc4973d980249a48afbe20b8091a