Fix theme-change bug on devices that like to preserve Intent extras.

Bug: 67854
Change-Id: Ief1d98b6832a79cc2c2e14b50ba7794f12ef43fd