- Added merged code (UI + internals) for Android (not tested)