am bf3531cf: am 2590c397: Fix more BackgroundManager glitches.

* commit 'bf3531cff30a23cb87db38a1a942de58d0603733':
  Fix more BackgroundManager glitches.