am 2382d404: Merge "BackgroundManager fixes." into lmp-mr1-ub-dev

* commit '2382d4049da726fc041bc48fca98d3f6f4ceed43':
  BackgroundManager fixes.