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

Change-Id: I38de9dc6ade82dc1c885770d6fb348bfed709a49