Merge "Fix switching running/cached apps with memory bar"