Merge branch 'pm-qos'