Merge "Cleanup of floatingMenuRadiiAnimation" into main