Merge "Fix stuck screen from display change timeout"