Is there a fix for the auto-rotate issue on the S6 edge?

[AC Question]

I have the S6 edge with Verizon as the carrier. I've had the auto-rotation issue since a couple weeks after I bought it. Before the 5.0.2 update, it would never rotate. I actually sent it in for repair (Samsung Service Center in Texas) and received it back in working condition. About a week after the 5.0.2 update for Verizon, my phone started the auto-rotation issue again. This time I find it combined with the auto-brightness issue where in the brightness, when on auto, stays in a locked medium brightness.

Interestingly, on occasion, when I reboot the phone everything would be operational for a few hours and then it would start again. I've been patiently waiting for the 5.1.1 update in hopes that will fix this issue. Any insight would be appreciated.