DFM-5: Fix NPE with Samsung devices

It seems to be like samsung devices doesn't like new instances of the same activity.
Merge pull request #18 from siempredelao/bugfix/DFM-5

DFM-5: Fix NPE with Samsung devices