Android compatibility changes.
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development