Revert "Expanded desktop: ERROR"

This reverts commit e915aaa72a3cdc9757232722ea34624231ddaac8.

Conflicts:
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java