Merge "[pm] describe warning dialog behavior in javadoc" into udc-dev