Merge "Clamp brightness to dim value if we're timing out and playing the screen off animation." into sc-dev