Merge "Fix locking for skip draw" into jb-dev