Merge "Have doze update the scrim controller rather than the scrim state." into pi-dev