[automerger] Merge "Smoother wake-up animation" into pi-dev am: f910fdb1da am: 62f380c409

Change-Id: Ifa386f9fe4bf2053fb0f8eba5e83a935330a13de