Merge "Re-enable use of isPrivilegedApp()"