Merge "Unify Activities and Windows under one lock (38/n)"