Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev