Don't throw IllegalStateException when the imageView is gone

Just let the client deal with the resulting null imageView
Merge branch 'dev' into shotvibe