Merge "clean surface when creating and fix bugs" into tizen_2.1