Merge "If extra ScrollView space, don't compress header"