Merge "Fix a bug about the z-order of layers caused by merging transactions" into qt-dev am: 6e52f838 am: a741d7c8 Change-Id: I476e43d1a4be0cdf51d17e3abc1f76aa9c1bedf1