Merge "Remove obsolete conditional preventing surface placement."