Merge "Animate owner info during wake-up transition" into pi-dev am: c28e772042
am: 1d580b825a

Change-Id: I75d49473d441579d58c4f2fa322c8e2d83e64ae7