Merge "Fix a couple compiler warnings in Settings" into udc-dev