am 45ad2b07: 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 '45ad2b07c30ed48b94d11c362105909348164f09':
  Update the database when converting the final screen. (Bug 11683562, Bug 11034205)