Merge "Fix for Mode locking issue" into tizen_2.1