Merge "Remove old "bulletin board style toolbar" from core"