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

Change-Id: Idcddf14e8aa3cfcd50b78ed112d51bf06424b840