Merge "sf: Fix incorrect state reporting in dumpsys"