Merge "Ensure visible notifications do not reorder when they HUN." into tm-qpr-dev