Merge "Fixes broken Settings test." into udc-dev