Merge "Don't update light reveal amt on doze change if biometric is wakeUnlocking" into main