Merge pull request #7823 from frsela/STK/Bug833630_UI

Bug 833630 - STK Display text does not give option to terminate SIM session, r=vingtetun
Merge pull request #7838 from frsela/STK/Bug833630_b

Bug 833630 - STK Display text does not give option to terminate SIM session, r=vingtetun