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

Change-Id: I9275ec47c4f8dab6b749426468829e061c69d67e