Draft: Backport changes from tizen repository

This is second commit connected with memory leaks that backports changes from tizen repository.

This changes were tested in Tizen environment but it is still required to test it on upstream version.