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

Change-Id: I64eb7707d74926c535296dc3232ff479c7605ce6