Merge "Fix switching running/cached apps with memory bar" into cm-11.0