Merge "Restrict USB poups while setup is in progress" into tm-dev