am 5d357cb3: Merge "Fixed for confirm button and cancel button is opposited in Stk dialog"

* commit '5d357cb3ee86721841c09d823fecb4b27448da86':
  Fixed for confirm button and cancel button is opposited in Stk dialog