Merge "Use existing uid state/capability/widget visibility as default" into udc-dev