Merge "Remove on drag listener after drag ended" into tm-qpr-dev