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

Change-Id: Ifc668b6004946f1669f8c5e57bca697276edb820