Merge "Move all non shell quickswitch tests to presubmit" into tm-dev