Merge "WM: Unify windows and activities proto dumps (88/n)"