ThemePicker: fix apply of empty primary overlay choices

Change-Id: I9b85c446f54433aa328d044c260d721f7e189c04
3 files changed