Merge "Update a size-compat restart icon" into tm-qpr-dev