Merge "BackgroundManager fixes." into lmp-mr1-ub-dev