Do some additional cleanup when switching handlers

Bug: 183962705
Test: Presubmit

Change-Id: Ia9295d2cf89fa6b6fe77c5e4861a704c4a82ab12
1 file changed