Merge "Removign optimations in onDestroy" into ub-launcher3-calgary