Merge "Skip screen animation if it is off" into udc-dev