Merge "BackgroundManager improvements." into lmp-preview-dev