Merge "Don't kill apps if they are not in restricted mode" into main