Merge "Move "when to dream" settings upwards for greater visibility" into tm-qpr-dev