Merge "Do not shake the padlock until there's an error" into qt-qpr1-dev