Merge "Fix [-] buttons in the notification builder test." into jb-mr2-dev