Another attempt at fixing an infamous Samsung activity transition NPE

Needs backport.

Closes #1007 (closed)

Merge request reports

Loading