Merge "Finish materializing dialogs" into lmp-dev