Move optimization to later part of pipeline

We were checking if the theme didn't change a bit too early, not
allowing for the setting or managed users to be properly evaluated.

Test: manual, switching themes
Test: atest ThemeOverlayControllerTest
Fixes: 230625942
Fixes: 229837333
Change-Id: I164c0b9f045db9077efc1b0f48dfcbbbfea21520