Merge "Fix SFPS icon remaining on screen" into main