Merge "Close the dialog activity when user click cancel or background" into udc-dev