Device Settings: Fixed missing back button on ActionBar

	Port of change 27086 to msm8960 devices

        PS2: Fix typo in commit description
        PS3: Fix missing line spacer

Change-Id: If5fb7032dd9312e4ab577019f0572714a965348f
Merge branch 'cm-10.1' into martincz