Merge "Fix double SCM Restart Icon" into tm-qpr-dev