Fix janky wakeup animation
am: c4cf07a16f

Change-Id: I198ed0d6d5385ba54f548def2680a02a400ee0c2