I followed these steps and noticed how much tighter the battery fit after! It had a fair bit of movement before but now no movement at all while clipped in. I hope this works!
Did you ever find a fix for this? I'm experiencing the exact same problem. When I reset the battery, it works again but always ends up having the same problem again.