Merge "Keep QS black during auth" into tm-dev