Fold tabStops into the propList

Change-Id: Iee866e27e76327fc04385e19ebcad2b6b4f36ea1