Merge "Improvements for CardEmulation/CardReader sample" into klp-dev