Display Change Bug is back, possible finally fixed this time