Merge "Fix settings crashed" into udc-dev