Fixing up some of the issues reported by @nbradbury here:

https://github.com/wordpress-mobile/WordPress-Android/commit/c531bbec313a43936145fe43e41031a872c2d276#commitcomment-4873772
https://github.com/wordpress-mobile/WordPress-Android/commit/c531bbec313a43936145fe43e41031a872c2d276#commitcomment-4873961
https://github.com/wordpress-mobile/WordPress-Android/commit/c531bbec313a43936145fe43e41031a872c2d276#commitcomment-4874096
https://github.com/wordpress-mobile/WordPress-Android/commit/c531bbec313a43936145fe43e41031a872c2d276#commitcomment-4874138