Dark theme upgrade broken

When upgrading release, night mode overrides evaluate to
true for unknown reasons. a check for manual toggle is added in order
to not apply overrides

Fixes: 150567159
Test: manual since it involves integration
Change-Id: I09af78fd16662185d01aea427188f79527d47a9e