Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into sc-dev