Merge "Check screenlock for unlock dialog" into qt-qpr1-dev