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

Change-Id: If6691910c0f7ca80329ebd6c89530380e30a92a0