Merge "Add screenshot test for edit state drop targets." into tm-qpr-dev