mozilla-b2g/gaia — pull request #4352 by timdream (2012-09-05 10:20:46+00:00)
Title: Screen brightness changes due to device light censor should be graceful

and,

- Real fix of #2166: Shorter screen off time if lock screen is never unlocked (correction error made in #3858)
- Revert workaround for #3268 since https://bugzilla.mozilla.org/show_bug.cgi?id=781076 is fixed