Merge "Added inheritance for segment->segment/instant, tabbar->tabbar/instant, basic...