Merge "Suppress transition when mCancelWithDeferredScreenshot as true." into qt-dev am: 71b77cf5c3
am: a1c96ed096

Change-Id: Ica4165551acfc700a93c5a26d465b3d7c527cca7