Revert "Revert "Revert "Update immersive confirmation."""

This reverts commit 5fe37c06c4b96929b452c4b6b279b3a470383db1.

Conflicts:

	core/res/res/values/cr_strings.xml
Revert "Revert "Revert "Switch to CM's expanded desktop."""

This reverts commit 705d485536e8ed24c1a97b88e73723862e213747.

Conflicts:

	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java