Merge "DO NOT MERGE: Fixes NPE when preparing app data during init" into qt-qpr1-dev