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

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