Merge "MTP: Add try/finally handling to finalize overrides"