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