Merge "Remove enable_pip_keep_clear_algorithm flag" into udc-qpr-dev