After the Marshmallow upgrade, when the phone's screen goes black, after a minute or so, I cannot wake the screen by double tapping or pushing the power button. I have to take the battery out and restart the phone every time. Quite cumbersome! Solution other than a factory reset???