Fix weird state when tracking and pressing back

Bug: 10934514
Change-Id: I60bbd6005e664033ed22c87b404ddc918e5f2c0e
1 file changed