This PR would bring all changes from Master into the Android branch. Android branch hasn't seen any updates in about a year, while Master has seen recent changes.
This would allow us to continue updating the Android branch with an easier way to merge it into master later
This PR would bring all changes from Master into the Android branch. Android branch hasn't seen any updates in about a year, while Master has seen recent changes.
This would allow us to continue updating the Android branch with an easier way to merge it into master later