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

* commit '5db573c733367bba7fd05d99632a5f475d7aadda':
  Fix garbage showing up beneath dialogs