Backported move screen enhancement from 3.4.