Bugfix: Revert moving the order of setting Spotlight preferences

--------------------------------------------------------------------------------
Change-Id:     If643e71fd82729471e1f4c571fbafd5f2e396617
Signed-off-by: Jeff Felchner <accounts+git@thekompanee.com>