Merge "Make unlock dialog exit if the person taps outside of the dialog"