Merge "Add a dialog when turning off oem unlock dialog."