Merge "Fix privilege escalation for preferred activities"