am 2590c397: Fix more BackgroundManager glitches.

* commit '2590c39739945451f80dcf8667709b93293fc8bc':
  Fix more BackgroundManager glitches.