Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev