Merge "Cleanup pixel ref mutexes in Skia" into jb-dev