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

Change-Id: I2d7b31cd3fd21ff918fa4d0a30de11656234a9d8