Merge "Don't put layout round and direction in override configuration"