Merge "Minor cleanup for ThemeOptionPreviewer" into ub-launcher3-master