[automerger skipped] Merge "Check screenlock for unlock dialog" into qt-qpr1-dev am: 4a03ca6ad1 am: f0cb74314b -s ours
am skip reason: Change-Id I08c7aa677150ca950785428580eee6a39ffadd37 with SHA-1 3b7cddc107 is in history

Change-Id: I238b9890835cad4c5be34849f06644442d001115