* commit 'e31ecf61042171242e6f31f22df7691c40f189b2': Fixing static StackView scenario (Issue: 3399844)