Merge "Check distraction flags in addition to suspension state" into qt-qpr1-dev