Merge "Toggle to flush BSS entries when interface is disabled"