Fix notification widget start

When starting playback first from a widget, the notification controls aren't
displayed. This commit should fix that and also clean up the code a bit.

Change-Id: Ic8463a16dd1d930540eb8d4c2ff2e1be26666b94
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1