Leverage the code from qt-qpr1-dev to master

Fixes: 147124412
Test: manual test

Change-Id: I6e937c6d34b635ecfdd2e29b22d0023f23f695e3
2 files changed