Merge "Only animate clock weight if doze is animating" into sc-dev