Merge "Fix clock fading in incorrectly" into tm-qpr-dev