Merge "Ensure dim changes are in same transaction; do not wait for token to change visibility" into udc-qpr-dev