Merge "Added non-app window tokens to window container hierarchy"