Merge "Tweak the layout of top app bar" into sc-dev