am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev

* commit '969b5ff492aae38fb89c98b2411e217e9b11638e':
  Fix garbage showing up beneath dialogs