Merge change I4151529e into eclair-sdk

* changes:
  Fix potential NPE in manifest editor when switching SDKs