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

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