Merge "Change tablet split confirm timing slightly" into tm-qpr-dev