Fold tabStops into the propList

Change-Id: Iab436fa599b6836a8a8f7659cd18ed38cbd3911d