I have set my Galaxy Note Edge to have no lockscreen. This has always worked until the Marshmallow update. It is still set to "none" under the lockscreen settings, but yet the lockscreen won't go away. Please tell me we are not stuck with it! Any suggestions?