Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb