Merge "Move SoftGateKeeper into gatekeeperd" into mnc-dev