Fix janky wakeup animation am: c4cf07a16f
am: ad08a8b21d

Change-Id: I3e9c1c9b5983534708ea2a092ed5b7523487f0bf