Merge "[*][scroller] apply nbeat-hd and nbeat-black-hd"