Merge "Follow up to ambient brightness stats change"