Merge "Eliminating dead logic - bitmap state simply cannot be null here."