Merge "SF: Check the active mode for nullptr in dumpsys" into sc-dev