Merge "Separating methods for updating the model to a sepatate class." into ub-launcher3-master