Merge "Removes unused mAwaitingDelegateResponse" into tm-dev