Merge "Check screenlock for unlock dialog" into qt-qpr1-dev am: 4a03ca6ad1

Change-Id: I8ab8f5e12e4ec1a14e5f464931a0496ee3483f93