Merge "Change ObjectLock to take Handle instead of Handle pointer."