Merge "Recover from dead GateKeeperService Binder"