Merging from qt-qpr1-sysui-dev @ build 5855545

Test: manual, presubmit on the source branch

Change-Id: Idc3d5c39427722a5486552312552f7f77ef40980