Create a merged XFolderPicker2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.

Change-Id: I4a2c2a8d491a8d5633c19ddcea547f0efe75b91d