am 6dc8f7c8: Merge "Update the database when converting the final screen. (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf

* commit '6dc8f7c856f51223213c4106ebe9320f15f01013':
  Update the database when converting the final screen. (Bug 11683562, Bug 11034205)