Merge "Only clipping heads up that are not the first ones" into qt-r1-dev
am: dbe49843de

Change-Id: Iedd7fac62abde02de70b0e832ec073eb60fbb0ac