Merge "Call layoutAndAssignWindowLayersIfNeeded while holding mGlobalLock"