Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev