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

Change-Id: I786f8292b5bb94807db2309cbe0e594bd4d26156