Merge "Fix surface didn't fade out when dismiss" into udc-dev