Beginnings of bouncer support; add scrims and state tracking

Integrating from prototype app

Change-Id: Ib142cf371c5997f547266d8af7e25129fb4e1343
7 files changed