Merge "Only delay wake-up animation if AOD is enabled" into udc-dev