am 8caf1c7f: Merge "BackgroundManager improvements." into lmp-preview-dev

* commit '8caf1c7f7da73186a03751bdd959b8137c9bd222':
  BackgroundManager improvements.