Merge "Use a row instead of the entry for tracking the topHeadsUp" into main