Merge "Move legacy obb data migration to a handler thread." into qt-dev am: 6d371e092e
am: 21ab5c0e34

Change-Id: I5668ed9cea4dc3e7f46449b6de39e43db88387d8