Merge "Make unlock dialog exit if the person taps outside of the dialog" into qt-qpr1-dev
am: 7ca7382a6e

Change-Id: I6fe2e01cd5c11f29d3ad5427502295daf629ab46