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

Change-Id: I158c05e9bd15f9dda46bbcb09a313d7932d72c02