When dialling or adding a contact, default to network locale rather than sim
locale.  When syncing contacts prefer sim locale so contacts don't break while
roaming.

Special case the JMP SIM to be from US even though it is actually from FR.

* muc-tags:
  Show and edit tags on MUC bookmarks
  Fix and updates Bookmarks2 support

* next-submit:
  Allow webview to intercept action before sending over XMPP

This path is just for fallback to data stored by upstream, so only use it if
upstream stored their flag.

But only if using bookmarks2, since otherwise any other app is likely to
overwrite and lose them.

* sims-basics:
  Remove redundate oobUri, set FileParams from OOB or SIMS

* serve-bob:
  Advertise bob support
  Reply to requests for BOB data

Support the stable version namespace and the new elements, including preserving
any extension content.

Especially since this applies to merged messages

Race condition could wipe them out

Especially during start up, syncRoster can get called a *lot*.  We already avoid
doing them in parallel, but they can happen one right after the other, locking
up the DB and churning IO.

Now, after we persist the roster, wait for 500ms before giving the next persist
a chance to run.  That way, other stuff has 500ms to get work done and we lose
very little DB consistency in the case of a failure.

The url was being stored as part of oobUri and the FileParams, which is
redundant.  Just store FileParams now, and construct it directly from the OOB
or (newly) SIMS reference if present.

This brings rudimentary support for SIMS, which saves us a file size check
roundtrip when SIMS is present.

* xhtml-im:
  Fetch XEP-0231 inline images from trusted contacts
  Actually display images we already have inline in XHTML-IM
  Support for storing and displaying XHTML-IM
  Preserve Text Nodes in XML

If a contact is trusted or already likely to know our presence (due to having
sent them a message) then auto-fetch XHTML-IM inline images via XEP-0231 from them.

If we already have the image for the Cid downloaded, then do create the
thumbnail and show it inline.

Only supports images with XEP-0231 compatible cid: URIs, otherwise images render
as a fallback image.  This commit doesn't yet support fetching the images at
all, but can ask a passed-in thumbnailer to figure out getting the image for a
certain Cid.

The XML model that was being used was not able to represent elements with text
nodes and element children interspersed (such as in "markup like" XML:
<x>abc <y>def</y> ghi</x>).  This switches from a single content String to a
list of child Node.  Content is pulled from all children recursively.  A list of
Element children is also maintained since this list is frequently traversed so
it saves runtime checks in all of those loops at the expense of a small amount
of memory.  Since the children and childNode lists must be kept in sync, they
are both made private to avoid a child class trying to mutate one of them
without a safe helper.

Use the labels and icons from JMP onboarding, don't ask users if they want to
create an account on their "own server".

* recolour-bubbles:
  Fix shadow, add tails, fix monochrome
  Match theme colours
  Less bubbly
  Remove unused 9patch
  add the newly created color entries to the bubble Drawable
  add XML entries for sent/received bubbles
  remove hardcoded bubble color
  link all the old 9patch refereces to the new Drawables
  Tweak the chat page for the new bubbles
  forgot to commit the new bubble Shape Drawables
  link all message bubbles from all themes to the same XML drawable
  use the new msg bubble XML instead of the 9patch PNGs