cherry pick conflict resolved
allow for titleless message dialogs
format
strings for unlock