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

Change-Id: Ieb75e3bfbabbb45c169afa561c781a22cc193a9c