Merge "Check screenlock for unlock dialog"