Merge "Couple tweaks for surface control registry" into udc-dev