Merge "Include window location after encoded view hierarchy"