Merge "Fixing some Launcher crashes because of using old model data even after launcher has reloaded" into ub-launcher3-master