> Cycled the battery. After running the battery calibration app, I let the battery drain all the way to 0% (phone shutdown) and then charge it back to 100%.

This is bad advice if you want your battery to last longer until you need to buy a new one.

Full discharge cycles might give you a slightly longer charge for the next cycle but they reduce the overall lifetime of the battery as much as 3-4 drain/charge cycles between 20% and 80%. A battery that continually runs 0% to 100% drain/charge cycles will only live 300-400 cycles, versus a 20% to 80% battery that may live 1200 cycles.

You might think the tradeoff in battery lifetime versus charge duration is worth it but as the battery loses lifetime, its maximum charge will be reduced so you'll quickly have shorter charge durations.