Merge "Replace error/info footers with a message bar."