Merge "Fix RelativeLayout rules" into qt-dev am: a04e6a22ea
am: edf745d255

Change-Id: I52904b32b6ec9ef1a6334dead39c594389868b2d