Revert "Use ArrayListExtra for broadcasting theme changes [2/2]"

This reverts commit ebf8f37515c23a167cef2bb8cff04854c52fd35b.

Change-Id: If80e3bc0443fa9e79c085e9251f4be0a10730397