Android: Beta 3 (again)

Finishing off what I had envisioned for Beta 3, including the crash fix.