am 04e6827a: Fix settings db update sequence
automerge: 281763b

* commit '281763ba1b4a6255799046f78930b586cd7e541c':
  Fix settings db update sequence