[automerger skipped] Merge "Reduce the delay of showing unlock dialog to 0" into qt-qpr1-dev am: 46e4dd099c
am: 06ab601fef -s ours
am skip reason: change_id I0016290a5181b9acba73503f938772b90f583f66 with SHA1 13ae817be2 is in history

Change-Id: I6e50ee04646bb018e2a462d2c418defecccaa627