Fold tabStops into the propList

Change-Id: Iff95c7d1b24ba6bdf6e5c98e598ce7b35451fa7f