Merge "Replace mPendingRemove with hierarchy deferred removal"