Resolves: #i124816# use correct layer for new object when converting

(cherry picked from commit c0f03c75c71dde47e210ca23eefe3c879b89d97c)

Change-Id: Iaf6f9e040553482f5b7d9522ea640dcea0fdd8cc