Merge "Prevent QSPanel from remeasuring" into qt-qpr1-dev