Merge "Expire landing flags after an hour." into main