Merge "Introduce ActivitySnapshotController(3/N)" into udc-dev