Refs #19175; Updated layout for eea, fixed default tooltip format
Merge remote-tracking branch 'upstream/master'