Merge "Don't kill apps that are multi-user aware..." into mnc-dev