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

Change-Id: Ifc86f710b2ca684145d671aa6d70da7783a0cbd9