Merge "ActiveModeWarden: Fix scan mode change handling when wifi is on" into sc-dev