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

Change-Id: I08e856f94da8ac0b1151d61e8717088672852f6a