Merge "gatekeeperd: fixed potential nullptr deref"