Merge "WindowProcessController: optimize locking" into rvc-dev