Merge \"Adding a DB update path to handle the QSB position change\" into ub-launcher3-calgary
am: 0af8af3a60

Change-Id: Id09d7bf2bbe5a123a026ce788c4d277d2d07740a