Extended QS Options: fix force close on theme changes

Change-Id: I1df69f417f58d413c932c2121dad5166c30a56f7