handle multiple states
Merge branch 'master' into mbta
forgot to set drawable state
Merge branch 'master' into mbta
fix arrow position
Merge branch 'master' into mbta