Merge "switching animation to screenshot to avoid visual jank" into udc-dev