Merge "Merge "Remove interaction flag code replaced by QuickStepContract (1/2)" into qt-dev am: c83bdb4626" into qt-dev-plus-aosp