CM11 Themes: Allow defining a custom default theme [3/3]

Change-Id: Ieed1f6c67972cd24f981df5bdb7095a1444f40c1
Merge "CM11 Themes: Allow defining a custom default theme [3/3]" into cm-11.0