Merge "WindowProcessController: optimize locking" into rvc-dev am: 345d68d164

Change-Id: I01a070c306cd3cd75fc567ee332bd793ec5c7467