Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo