MASSIVE SHIT [see message for FULL details]
Okay, due to some merging madness,
I had to do this, since the cherry-picks from master would have messed me up.
I pulled a drag/drop sesh on this shit, so bare with me.

_________________

Electronbeam [1/2]

Adds a "scale down" screen-off effect. This is one experiment to see
how we can become more creative to make some cool screen-off anims.

________________________________

Keyguard: Bring back fast unlock

__________________________________________________

KeyguardViewMediator: Play lock screen sound sooner

When the screen is locked, there is a long pause before the lock
sound actually plays. This makes that sound happen much sooner.

_____________________________________

Display options: allow configuration of wake on plug behavior (2/2)

______________________________________________

Notification LED Control (1/2).
[Original writen at CyanogenMod by David Van Tonder (DvTonder <david.vantonder@gmail.com>).]

* Make led color customizable.
* Global and per-app settings.
* Default led color is white.
* The option category replace old stock on/off checkbox.
* Remove useless code from display settings, the feature has its own java files.
* The java files in settings are stored into its own com/android/settings/notificationligh folder.
* Credits into code comments of each specific java file.

PS2/3/4:

* Fix code derps.
* Forget to define a method.
* Remove wrongly added code.

PS5/6:

* Move entries to pa_symbols and pa_config.
* Update description.

PS7:

* Use ArrayMap instead of HashMap (more memory efficient).
* Remove observer for medium battery level.

PS8:

* Correctly import ArrayMap.
* Didn't updated creating of ArrayMaps.

PS9/10:

* Fix defaults.
* Enable battery led.
* Update description.

PS11/12:

* Ditch battery led option.
* Update commit description.

__________________________________________

[1/2] LED: Battery Light
==Requires==
in device tree's overlay/frameworks/base/core/res/res/values/config.xml:

    <!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
    <bool name="config_intrusiveBatteryLed">true</bool>

    <!-- Does the battery LED support multiple colors? Used to decide if the user can change the colors -->
    <bool name="config_multiColorBatteryLed">true</bool>

PS6: enable by default
PS7: rmv public.xml additions
PS8: incompatible types getInteger to getBoolean
PS9: Works

I think this about Covers it all..... Not sure, I hope though.
Massive work done by Swiper for this shit, and that dont include the merger madness.