Yep. All that is done.
Instructions are not the easiest to follow, the Jolla and Android steps seem to contradict themselves in a lot of cases. Like there's no telling how far you need to go when dealing with the Android side of it.