Merge "Trigger re-inflation when configuration changed" into udc-dev