Merge "Do not record snapshot when snapshots are disabled" into udc-dev