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

* commit '658a7846cac4235653fe264c09182302262971ae':
  Fix garbage showing up beneath dialogs