Merge \"Executing the DB migration during startup instead of restore.\" into ub-launcher3-calgary
am: 05e4ba0d57

Change-Id: Ief999709d1d66752a1ee619a454b8771d3249c36