Merge "Smoother wake-up animation" into pi-dev
am: f910fdb1da

Change-Id: Ia0e6618b47a0daea89e4e17a1b3565ed9c7439c7