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

Change-Id: I4526860bb4f75d57f980ce2f5f3342095d6c11ad