Merge "Temporary decouple snapshot controller from transition." into udc-dev