Merge "Fix decor stuck after rotate" into udc-dev