Merge "Exclude WindowState from transition targets"