Merge "Allow electron beam for device with brightness animation enabled and...

Merge "Allow electron beam for device with brightness animation enabled and disable fade (when electron beam is disabled) for device with brightness animation disabled." into gingerbread