Merge "qseecom: update on smcinvoke-aware listeners operations"