Merge "Avoid the exception when UI shows the fragment" into udc-qpr-dev