Merge "Add an option to connect OMXClient to a Treble service."