Fixed a regression causing theme switch to fail.

This would only occur when switching from one theme APK to another,
which apparently was not tested on the experimental branch (??).  The
bug would not repro if switching between system default and a theme APK.

Change-Id: I9fc0b5c50c1dff4a0b2d548980977faaa0a51167