UI Bug fixes
UI bug fixes - Verifying commit
Merge branch 'master' of https://github.com/nrajashekar/nfc_hce.git