Merge "Add ENABLE_NEW_PRIVACY_DIALOG flag" into udc-dev