[wrt][XWALK-1541][XWALK-1539]Fix XWALK-1541/1539

Detailed commit message (if have)]
Impacted TCs num(approved): New 0, update 14, deleted 0
Unit test platform: [tizen]
Unit test result summary: Pass 14 , Fail  0, Blocked  0