Merge changes from topic "backport-cpu-usage-bugs" into qt-qpr1-dev am: 8d1721cd61

Change-Id: I2b920c0fff703a13ac09d17c2fee33225156f3fc