HEMERA-3537,HEMERA-3538: Weaken auto relayout, fix regression