Merge "Unify Activity level of window hierarchy (50/n)."