Merge "Fix cpu hint for sw codecs" into qt-dev