Merge "Fixing StackView rendering bug exposed by recent Launcher change"