Revert "Revert "Finished android back button""

This reverts commit af0d91d936f5256e3c160bcb8166c525cd4c4c42.