Merge "Revert "Replace mPendingRemove with hierarchy deferred removal""