Merge "fixing vid startup issue after resource limit"