Merge "Drop unused PerBootDbKeepAlive type" into main