Merge "Check fallbacks correctly in getHeaderVariant()."