Merge "Do not set camera preview display if the surface is null."