bugid-44749: Fixing overlay positions
Merge branch 'bugid-44749' into dev