Merge "Fix stuck when fullscreen launch" into udc-dev