Fix shimmy cold start jank

Bug: 13392593
Change-Id: I08a45bad9fc93a284a9966fa8aa8c6e13e674ae5
2 files changed