Merge "Prevent QSPanel from remeasuring" into qt-qpr1-dev am: acc44b21a6
am: ab13543f7c

Change-Id: I3b7f69bad7349ab095945f1a7364d48eb85631c9