am f9166c19: am 6975554d: am 5db573c7: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev

* commit 'f9166c19773bbde04e1837327b85d5935530cfee':
  Fix garbage showing up beneath dialogs