Merge "Register fallback even if background already exists"