bug 828195 - always listen to card state change
Bug 827655 - Part 1: STK Get input display timeout takes too long. r=ochameau
Merge pull request #7434 from evelynhung/issue-828195

bug 828195 - always listen to card state change
Merge pull request #7418 from psiddh/input_text

Bug 827655 - Part 1: STK Get input display timeout takes too long. r=@ochameau
Auto-merge from branch 'master'