Merge "Use getProfileParentId() in native permission helper (2/2)"