Merge "Fix lingering sfps indicator" into main