Merge changes I838b4797,I9fce3bb8,Ia081a0ad into udc-dev

* changes:
  Set initial message after
  Set lockout in onResume.
  Revert "Set lockout in onResume."