Merge "BackgroundFallback: Cover all cases where the fallback is needed" into pi-dev