[automerger skipped] Merge "Make unlock dialog exit if the person taps outside of the dialog" into qt-qpr1-dev am: 7ca7382a6e
am: 9af8bb479d -s ours
am skip reason: change_id Iabbca72bf65b5e93aafd53296d77a88ccaaf5dfd with SHA1 fe3efb667f is in history

Change-Id: Iec365ff95a6705fbb71e69d7f8cf2985fd669569