Rework Volume-Music-Control fix.

Avoid use of the volume up/down hack.
This method just delays the volume hooks if the
user desires the long press option. Otherwise, the
buttons behave as they did before.

-Edited to remove code left in from the last patch
-Fix whitespace issues suggested by Sven
-Really fix whitespaces.. (oops!!)

Change-Id: I1fb0b04fea3b38a6f3e3277b8e323a2ed539f11a