Merge "Add ServiceExpiredCallback" into main