Merge "Pixmap render surface synchronization moved to thread-synchronization" into...