Merge "Move blacklisted methods back to greylist" into qt-dev