Merge "Set no data transfer on function switch timeout for accessory mode" into tm-dev