Revert "Settings: Simplyfiy expanded desktop summary"

This reverts commit 4b0af9cf8b015a751f2a32851c1140344d96b529.

Conflicts:
	src/com/android/settings/cyanogenmod/PowerMenu.java