Merge "base: genlock: Check for instances where handle is NULL" into msm-3.0