Merge "Reduce the delay of showing unlock dialog to 0"