Merge "ApiResult: Add ApiResult::formatExpiry()"