Dialer: restore full compatibility with theme chooser

Change-Id: Id6d3d7d97d5c136779711eca66cc29cf59a2e205
Merge branch 'cm-11.0' into martincz