Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo