Merge "resizable: disallow transition overlap" into emu-master-dev