Merge "Make QS rounding match notifications"