Prevent the strange crash issue for S5 devices.

I'm not sure what is causing this and I'm not sure if the
changes will prevent MCT from crashing (on Samsung Galaxy S5).