Merge "Remove BarController" into sc-dev