Merge "Cleanup SFPS indicator code" into main