Merge "Make crypt dialogs material" into lmp-dev