Follow-up Id9597fde: Restore toolbar-bar class

Change-Id: Ic5b79d251c25a578e8c8efcc4e98aba5630f5c68