Merge "Fix ClassCastException at NetworkSelectSettings" into udc-qpr-dev