Merge "Make pre-upgrade footer appear more consistently"