am 799f0e50: am 4001120e: am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo