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

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