Merge "Reduce the delay of showing unlock dialog to 0" into qt-qpr1-dev