Recalibrate battery life on a Surface Pro

My Surface Pro (5th version) has had a pretty dramatic drop in battery life recently.  It lasts about 1.5 hours now.  But the biggest issue is that the battery life meter in Windows 10 is no longer accurate and the device will just die around 40% of battery life left instead of hibernating/sleeping/shutting down.  I have found that in this state, you can't charge it with a Surface Dock.  You have to use the Surface charger.

Is there anyway to recalibrate the battery life sensor to get an accurate read on how much battery life is left?