Merge "Revert "Support lights-out + bar icon dimming on low-end devices.""