Navbar: add spacer to lightsout layout

This will align the lightsout buttons with the normal ones.

Change-Id: I9a3008ae8f16f35efc595d2a2f1d07a3eef47c29
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Framework: Fix Sound/Phone Settings FC

If the user deleted their default
    vibration pattern, the log spewed
    the catch exception along with
    cursor not closed errors.
    Fix cursor (close in catch too)
    And set default back to default.

PS3: Guidelines

Change-Id: Ib0c8b4c7d541e407bee219d78014512d2903f176
per app color fix

Change-Id: Ib5360af4db1d4e0bb62d677a90440de662989d42
Fix NPE

Change-Id: I281cd19338e7f0817725b73bdefb1dc616dec9b9
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2