Merge "Change cancel button type to skip for SUW" into qt-r1-dev