Merge changes Ic81ad683,I082c94f7,I43f93cbf,I0396ae62 into udc-dev

* changes:
  Set lockout in onResume.
  Move async_bouncer to teamfood.
  Set needs input after inflating.
  Launch feature to teamfood.