Merge "[Language] Do not back to previous page if dialog is displaying." into udc-qpr-dev