Merge "Removign optimations in onDestroy" into ub-launcher3-calgary
am: 38138ddcca

* commit '38138ddcca4e5c6909ca8f7a4bb24621c063a3a6':
  Removign optimations in onDestroy