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

Change-Id: Ie80ac5885e2ae5e093c4faec69229ec5672516b6