Merge "Address Pointer Capture crash during rapid toggles" into tm-dev