Merge "Fixed for confirm button and cancel button is opposited in Stk dialog"