Yeah, I can't really afford to do a reset and all that debugging.
I was mainly relying on the fingerprint unlock, to prevent wear on the power button, since touch interfaces aren't susceptible to it. I guess I'll just have to accept that the industry wants me to eventually destroy my phone so...