Merge "Smoother wake-up animation" into pi-dev