Merge "Update edit state drop target and hotsteat margins." into tm-dev