Merge "HCE: Latest UX and strings." into klp-dev