Merge "Tweak UI of profile tab layout" into sc-dev