Merge "Make sure to reconfigure the ratio on resume" into udc-dev