Fix misalignment of profile button with icon

Change-Id: Ia0b5016b01d4b3fd856153135596bae6a68489ab
Set vibration toggle as gone if vibration not available

The "vibrate" and "increasing volume" options are displayed on the same
row with the vibrate setting first. Setting a view as invisible makes
its contents invisible but still occupies the view's space. Using gone
doesn't.

Change-Id: Ia57141c3ce48f3f6e7f081e83e30f7d8905977d9
Merge branch 'cm-10.2' into martincz