Merge "Smooth transition when switching dreaming." into tm-qpr-dev