Dismissing popup if the underlying icon no longer supports it

Bug: 168641545
Change-Id: Ia4f44819af02397efaead935db3fc8e305e47ba7
3 files changed