am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."

* commit 'f26ec38c344af8cf91575b461028a3033b940d49':
  Eliminating dead logic - bitmap state simply cannot be null here.