Merge "Remove broken and unused support for expiring keys when off-body" into main