Merge "Catch exception when initializing the persister to avoid crash" into udc-qpr-dev