Merge "Creating a new alarm when drag X,Y change" into tm-qpr-dev