Merge "Cancel layer update when a layer is about to be destroyed Bug #9310706"