Finally (I think) got the back button handling working properly.
Merge branch 'david3'