Merge "Support regular toolbar" into sc-dev