Merge "Clear last user selection on wifi disable"