Merge "Revert "add workaround code for LifeDuration"" into tizen_2.1