Merge "Restarting launcher if a flag changes" into tm-qpr-dev