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