Another attempt at fixing an infamous Samsung activity transition NPE Closes #1007 See merge request akwizgran/briar!677