Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev