Merge "Remove Modify popup menu for non-admin" into tm-qpr-dev