Merge "Fix bug where we incorrectly change the default profile id of the database." into ub-launcher3-qt-qpr1-dev am: a42681f6d2
am: 71834aa186

Change-Id: Id5169fab20896a5e24e8856b714edc1b5cc738ad