Merge "Fix for TDIS-6016 & 6017" into tizen_2.2