Bug 935391 - Better light sensor behavior to reduce the flicker
Merge branch 'bug935391'

Manual merge and close #14919