Merge "Fix garbage showing up beneath dialogs" into lmp-dev