Fix switching running/cached apps with memory bar

Fixes upstream issue #38735
http://code.google.com/p/android/issues/detail?id=38735

Ported from CM10
http://review.cyanogenmod.org/25775

This patch is already submitted to AOSP. No feedback from them yet.
https://android-review.googlesource.com/45993

Change-Id: I484e30d3fd4f5425e174911ae22bb2def170e6b8
Forward Port Circle Battery

Change-Id: I587548834f70874e74f3e986fcb187c2c9d3a1cd
Settings: add Advanced Settings under Display

For use in TV-Out settings and mDNIe

Change-Id: Ib595b81a11e19f8526e532400e57f5771db09499
Merge "Settings: add Advanced Settings under Display" into cm-11.0
Merge "Fix switching running/cached apps with memory bar" into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Change-Id: I757d4116803081b29a509ac13119e2311d0dca7a